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

Cleaner ads setup

This commit is contained in:
Mr. Stallion 2019-12-07 09:23:58 -06:00
parent 66a083cbdb
commit 10ce035890
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
chat/ConversationView.vue
View File

@ -90,7 +90,8 @@
<div>{{(adAutoPostNextAd ? adAutoPostNextAd.substr(0, 64) : '')}}...</div> <div>{{(adAutoPostNextAd ? adAutoPostNextAd.substr(0, 64) : '')}}...</div>
</div> </div>
<a class="btn btn-sm btn-outline-primary renew-autoposts" @click="renewAutoPosting()">{{l('admgr.renew')}}</a> <a class="btn btn-sm btn-outline-primary renew-autoposts" @click="renewAutoPosting()" v-if="!adsRequireSetup">{{l('admgr.renew')}}</a>
<a class="btn btn-sm btn-outline-primary renew-autoposts" @click="showSettings()" v-if="adsRequireSetup">{{l('admgr.setup')}}</a>
</div> </div>
<div class="border-top messages" :class="getMessageWrapperClasses()" ref="messages" <div class="border-top messages" :class="getMessageWrapperClasses()" ref="messages"
@scroll="onMessagesScroll" style="flex:1;overflow:auto;margin-top:2px"> @scroll="onMessagesScroll" style="flex:1;overflow:auto;margin-top:2px">
@ -174,6 +175,8 @@
import {isCommand} from './slash_commands'; import {isCommand} from './slash_commands';
import UserView from './UserView.vue'; import UserView from './UserView.vue';
import UserChannelList from './UserChannelList.vue'; import UserChannelList from './UserChannelList.vue';
import * as _ from 'lodash';
@Component({ @Component({
components: { components: {
@ -211,6 +214,7 @@
autoPostingUpdater = 0; autoPostingUpdater = 0;
adAutoPostUpdate: string | null = null; adAutoPostUpdate: string | null = null;
adAutoPostNextAd: string | null = null; adAutoPostNextAd: string | null = null;
adsRequireSetup = false;
isChannel = Conversation.isChannel; isChannel = Conversation.isChannel;
isPrivate = Conversation.isPrivate; isPrivate = Conversation.isPrivate;
showNonMatchingAds = true; showNonMatchingAds = true;
@ -281,7 +285,7 @@
get messages(): ReadonlyArray<Conversation.Message | Conversation.SFCMessage> { get messages(): ReadonlyArray<Conversation.Message | Conversation.SFCMessage> {
if(this.search === '') return this.conversation.messages; if(this.search === '') return this.conversation.messages;
const filter = new RegExp(this.search.replace(/[^\w]/gi, '\\$&'), 'i'); const filter = new RegExp(this.search.replace(/[^\w]/gi, '\\$&'), 'i');
return this.conversation.messages.filter((x) => filter.test(x.text)); return this.conversation.messages.filter((x) => filter.test(x.text) || (filter.test(_.get(x, 'sender.name', '') as string)));
} }
async sendButton(): Promise<void> { async sendButton(): Promise<void> {
@ -337,7 +341,9 @@
} }
@Watch('conversation.typingStatus') @Watch('conversation.typingStatus')
typingStatusChanged(_: string, oldValue: string): void { // tslint:disable-next-line: ban-ts-ignore
// @ts-ignore-next
typingStatusChanged(str: string, oldValue: string): void {
if(oldValue === 'clear') this.keepScroll(); if(oldValue === 'clear') this.keepScroll();
} }
@ -504,10 +510,13 @@
diffMins, diffMins,
diffSecs diffSecs
) + l('admgr.expiresIn', expDiffMins, expDiffSecs); ) + l('admgr.expiresIn', expDiffMins, expDiffSecs);
this.adsRequireSetup = false;
} else { } else {
this.adAutoPostNextAd = null; this.adAutoPostNextAd = null;
this.adAutoPostUpdate = l('admgr.noAds'); this.adAutoPostUpdate = l('admgr.noAds');
this.adsRequireSetup = true;
} }
}; };

1
chat/localize.ts
View File

@ -24,6 +24,7 @@ const strings: {[key: string]: string | undefined} = {
'admgr.activeHeader': 'Auto-Posting Ads', 'admgr.activeHeader': 'Auto-Posting Ads',
'admgr.comingNext': 'Coming Next', 'admgr.comingNext': 'Coming Next',
'admgr.renew': 'Renew', 'admgr.renew': 'Renew',
'admgr.setup': 'Setup Ads',
'admgr.toggleAutoPost': 'Auto-Post Ads', 'admgr.toggleAutoPost': 'Auto-Post Ads',
'consoleWarning.head': 'THIS IS THE DANGER ZONE.', 'consoleWarning.head': 'THIS IS THE DANGER ZONE.',
'consoleWarning.body': `ANYTHING YOU WRITE OR PASTE IN HERE COULD BE USED TO STEAL YOUR PASSWORDS OR TAKE OVER YOUR ENTIRE COMPUTER. This is where happiness goes to die. If you aren't a developer or a special kind of daredevil, please get out of here!`, 'consoleWarning.body': `ANYTHING YOU WRITE OR PASTE IN HERE COULD BE USED TO STEAL YOUR PASSWORDS OR TAKE OVER YOUR ENTIRE COMPUTER. This is where happiness goes to die. If you aren't a developer or a special kind of daredevil, please get out of here!`,