kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix to ad manager

This commit is contained in:
Mr. Stallion 2021-12-29 15:57:04 -06:00
parent fe9f802d5c
commit fdc7bec43d
7 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog # Changelog
## 1.16.2
* Fixed broken auto-ads
## 1.16.1 ## 1.16.1
* Fixed ad fields becoming uneditable after an ad is removed * Fixed ad fields becoming uneditable after an ad is removed
* Fixed ads attempting to send after leaving a channel * Fixed ads attempting to send after leaving a channel

6
README.md
View File

@ -1,7 +1,7 @@
# Download # Download
[Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.16.1/F-Chat-Rising-1.16.1-win.exe) (75 MB) [Windows](https://github.com/mrstallion/fchat-rising/releases/download/v1.16.2/F-Chat-Rising-1.16.2-win.exe) (75 MB)
| [MacOS](https://github.com/mrstallion/fchat-rising/releases/download/v1.16.1/F-Chat-Rising-1.16.1-macos.dmg) (76 MB) | [MacOS](https://github.com/mrstallion/fchat-rising/releases/download/v1.16.2/F-Chat-Rising-1.16.2-macos.dmg) (76 MB)
| [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.16.1/F-Chat-Rising-1.16.1-linux.AppImage) (76 MB) | [Linux](https://github.com/mrstallion/fchat-rising/releases/download/v1.16.2/F-Chat-Rising-1.16.2-linux.AppImage) (76 MB)
# F-Chat Rising # F-Chat Rising

8
chat/conversations.ts
View File

@ -641,14 +641,6 @@ export default function(this: any): Interfaces.State {
queuedJoin(state.pinned.channels.slice()); queuedJoin(state.pinned.channels.slice());
}); });
core.channels.onEvent(async(type, channel, member) => { core.channels.onEvent(async(type, channel, member) => {
if (type === 'leave') {
const conv = state.channelMap[channel.id];
if (conv) {
conv.adManager.stop();
}
}
if(type === 'join') if(type === 'join')
if(member === undefined) { if(member === undefined) {
const conv = new ChannelConversation(channel); const conv = new ChannelConversation(channel);

2
docs/_config.yml
View File

@ -50,7 +50,7 @@ theme: jekyll-theme-slate
changelog: https://github.com/mrstallion/fchat-rising/blob/master/CHANGELOG.md changelog: https://github.com/mrstallion/fchat-rising/blob/master/CHANGELOG.md
download: download:
version: 1.16.1 version: 1.16.2
url: https://github.com/mrstallion/fchat-rising/releases/download/v%VERSION%/F-Chat-Rising-%VERSION%-%PLATFORM_TAIL% url: https://github.com/mrstallion/fchat-rising/releases/download/v%VERSION%/F-Chat-Rising-%VERSION%-%PLATFORM_TAIL%

2
electron/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fchat", "name": "fchat",
"version": "1.16.1", "version": "1.16.2",
"author": "The F-List Team and Mister Stallion (Esq.)", "author": "The F-List Team and Mister Stallion (Esq.)",
"description": "F-List.net Chat Client", "description": "F-List.net Chat Client",
"main": "main.js", "main": "main.js",

9
fchat/channels.ts
View File

@ -1,5 +1,6 @@
import {decodeHTML} from './common'; import {decodeHTML} from './common';
import {Channel as Interfaces, Character, Connection} from './interfaces'; import {Channel as Interfaces, Character, Connection} from './interfaces';
import core from '../chat/core';
interface SortableMember extends Interfaces.Member { interface SortableMember extends Interfaces.Member {
rank: Interfaces.Rank, rank: Interfaces.Rank,
@ -202,6 +203,12 @@ export default function(this: void, connection: Connection, characters: Characte
if(channel === undefined) return; if(channel === undefined) return;
const item = state.getChannelItem(data.channel); const item = state.getChannelItem(data.channel);
if(data.character === connection.character) { if(data.character === connection.character) {
const conv = core.conversations.channelConversations.find((c) => c.channel.id === channel.id);
if (conv) {
conv.adManager.stop();
}
state.joinedChannels.splice(state.joinedChannels.indexOf(channel), 1); state.joinedChannels.splice(state.joinedChannels.indexOf(channel), 1);
delete state.joinedMap[channel.id]; delete state.joinedMap[channel.id];
for(const handler of state.handlers) await handler('leave', channel); for(const handler of state.handlers) await handler('leave', channel);
@ -275,4 +282,4 @@ export default function(this: void, connection: Connection, characters: Characte
} }
}); });
return state; return state;
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "f-list-rising", "name": "f-list-rising",
"version": "1.16.1", "version": "1.16.2",
"author": "The F-List Team and and Mister Stallion (Esq.)", "author": "The F-List Team and and Mister Stallion (Esq.)",
"description": "A heavily modded F-Chat 3.0 client for F-List", "description": "A heavily modded F-Chat 3.0 client for F-List",
"license": "MIT", "license": "MIT",