You've already forked matrix-react-sdk
							
							
				mirror of
				https://github.com/matrix-org/matrix-react-sdk.git
				synced 2025-11-04 11:51:45 +03:00 
			
		
		
		
	Merge branch 'develop' into travis/moar-jitsi
This commit is contained in:
		@@ -36,6 +36,8 @@ import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from './utils/I
 | 
			
		||||
import {isPermalinkHost, parsePermalink} from "./utils/permalinks/Permalinks";
 | 
			
		||||
import {inviteUsersToRoom} from "./RoomInvite";
 | 
			
		||||
import { WidgetType } from "./widgets/WidgetType";
 | 
			
		||||
import sendBugReport from "./rageshake/submit-rageshake";
 | 
			
		||||
import SdkConfig from "./SdkConfig";
 | 
			
		||||
 | 
			
		||||
// XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 | 
			
		||||
interface HTMLInputEvent extends Event {
 | 
			
		||||
@@ -913,6 +915,27 @@ export const Commands = [
 | 
			
		||||
        },
 | 
			
		||||
        category: CommandCategories.advanced,
 | 
			
		||||
    }),
 | 
			
		||||
    new Command({
 | 
			
		||||
        command: "rageshake",
 | 
			
		||||
        aliases: ["bugreport"],
 | 
			
		||||
        description: _td("Send a bug report with logs"),
 | 
			
		||||
        args: "<description>",
 | 
			
		||||
        runFn: function(roomId, args) {
 | 
			
		||||
            return success(
 | 
			
		||||
                sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
 | 
			
		||||
                    userText: args,
 | 
			
		||||
                    sendLogs: true,
 | 
			
		||||
                }).then(() => {
 | 
			
		||||
                    const InfoDialog = sdk.getComponent('dialogs.InfoDialog');
 | 
			
		||||
                    Modal.createTrackedDialog('Slash Commands', 'Rageshake sent', InfoDialog, {
 | 
			
		||||
                        title: _t('Logs sent'),
 | 
			
		||||
                        description: _t('Thank you!'),
 | 
			
		||||
                    });
 | 
			
		||||
                }),
 | 
			
		||||
            );
 | 
			
		||||
        },
 | 
			
		||||
        category: CommandCategories.advanced,
 | 
			
		||||
    }),
 | 
			
		||||
 | 
			
		||||
    // Command definitions for autocompletion ONLY:
 | 
			
		||||
    // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user