michael/discord-vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: rework activity logic

Browse source
This commit is contained in:
iCrawl 2021-02-10 20:14:27 +01:00
parent 8fcb7e2691
commit ab046317f5
No known key found for this signature in database
GPG key ID: 1AB888B16355FBB2
3 changed files with 53 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "discord-vscode",
"displayName": "Discord Presence",
"version": "5.1.0",
"version": "5.1.1",
"description": "Update your discord status with a rich presence.",
"private": true,
"author": {

5
src/activity.ts
View file

@ -31,6 +31,7 @@ interface ActivityPayload {
matchSecret?: string;
joinSecret?: string;
spectateSecret?: string;
buttons?: { label: string; url: string }[];
instance?: boolean;
}
@ -72,10 +73,6 @@ export async function activity(previous: ActivityPayload = {}) {
}
if (window.activeTextEditor) {
if (window.activeTextEditor.document.languageId === 'Log') {
return state;
}
const largeImageKey = resolveFileIcon(window.activeTextEditor.document);
const largeImageText = config[CONFIG_KEYS.LargeImage]
.replace(REPLACE_KEYS.LanguageLowerCase, toLower(largeImageKey))

79
src/extension.ts
View file

@ -24,6 +24,14 @@ const rpc = new Client({ transport: 'ipc' });
const config = getConfig();
let state = {};
let interval: NodeJS.Timeout;
let listeners: { dispose(): any }[] = [];
export function cleanUp() {
listeners.forEach((listener) => listener.dispose());
listeners = [];
clearInterval(interval);
}
async function sendActivity() {
state = {
@ -32,41 +40,39 @@ async function sendActivity() {
rpc.setActivity(state);
}
async function login(context: ExtensionContext) {
async function login() {
rpc.once('ready', () => {
log(LogLevel.Info, 'Successfully connected to Discord');
statusBarIcon.text = '$(globe) Connected to Discord';
statusBarIcon.tooltip = 'Connected to Discord';
void sendActivity();
interval = setInterval(() => void sendActivity(), 5000);
const onChangeActiveTextEditor = window.onDidChangeActiveTextEditor(() => sendActivity());
const onChangeTextDocument = workspace.onDidChangeTextDocument(throttle(() => sendActivity(), 1000));
const onStartDebugSession = debug.onDidStartDebugSession(() => sendActivity());
const onTerminateDebugSession = debug.onDidTerminateDebugSession(() => sendActivity());
context.subscriptions.push(
onChangeActiveTextEditor,
onChangeTextDocument,
onStartDebugSession,
onTerminateDebugSession,
);
listeners.push(onChangeActiveTextEditor, onChangeTextDocument, onStartDebugSession, onTerminateDebugSession);
});
try {
await rpc.login({ clientId: CLIENT_ID });
} catch (error) {
log(LogLevel.Error, `Encountered following error while trying to login:\n${error as string}`);
rpc.dispose();
cleanUp();
await rpc.destroy();
if (!config[CONFIG_KEYS.SuppressNotifications]) {
if (error?.message?.includes('ENOENT')) void window.showErrorMessage('No Discord client detected');
else void window.showErrorMessage(`Couldn't connect to Discord via RPC: ${error as string}`);
}
rpc.statusBarIcon.text = '$(pulse) Reconnect to Discord';
rpc.statusBarIcon.command = 'discord.reconnect';
statusBarIcon.text = '$(pulse) Reconnect to Discord';
statusBarIcon.command = 'discord.reconnect';
}
}
export function activate(context: ExtensionContext) {
export async function activate(context: ExtensionContext) {
log(LogLevel.Info, 'Discord Presence activated');
let isWorkspaceExcluded = false;
@ -80,44 +86,59 @@ export function activate(context: ExtensionContext) {
}
}
const enabler = commands.registerCommand('discord.enable', () => {
rpc.destroy();
const enable = async (update = true) => {
if (update) {
void config.update('enabled', true);
}
cleanUp();
await rpc.destroy();
statusBarIcon.text = '$(pulse) Connecting to Discord...';
statusBarIcon.show();
void login(context);
await login();
};
const disable = async (update = true) => {
if (update) {
void config.update('enabled', false);
}
cleanUp();
await rpc.destroy();
statusBarIcon.hide();
};
const enabler = commands.registerCommand('discord.enable', async () => {
await enable();
void window.showInformationMessage('Enabled Discord Presence for this workspace');
});
const disabler = commands.registerCommand('discord.disable', () => {
void config.update('enabled', false);
rpc.destroy();
rpc.statusBarIcon.hide();
const disabler = commands.registerCommand('discord.disable', async () => {
await disable();
void window.showInformationMessage('Disabled Discord Presence for this workspace');
});
const reconnecter = commands.registerCommand('discord.reconnect', () => {
deactivate();
void activate(context);
const reconnecter = commands.registerCommand('discord.reconnect', async () => {
await disable(false);
await enable(false);
});
const disconnect = commands.registerCommand('discord.disconnect', () => {
rpc.destroy();
rpc.statusBarIcon.text = '$(pulse) Reconnect to Discord';
rpc.statusBarIcon.command = 'discord.reconnect';
const disconnect = commands.registerCommand('discord.disconnect', async () => {
await disable(false);
statusBarIcon.text = '$(pulse) Reconnect to Discord';
statusBarIcon.command = 'discord.reconnect';
});
context.subscriptions.push(enabler, disabler, reconnecter, disconnect);
if (!isWorkspaceExcluded && config[CONFIG_KEYS.Enabled]) {
statusBarIcon.show();
void login(context);
await login();
}
const gitExtension = extensions.getExtension<GitExtension>('vscode.git');
void gitExtension?.activate();
await gitExtension?.activate();
}
export function deactivate() {
rpc.destroy();
export async function deactivate() {
cleanUp();
await rpc.destroy();
}