supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #816 from DanielOaks/master+unhandled-slug

Browse Source 
Add slug with command to unhandled messages
This commit is contained in:
Pavel Djundik 2017-04-16 12:37:32 +03:00 committed by GitHub
commit f185c86a47
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/js/libs/handlebars/slugify.js Normal file
View File

@ -0,0 +1,5 @@
"use strict";
module.exports = function(orig) {
return orig.toLowerCase().replace(/[^a-z0-9]/, "-");
};

2
client/views/chan.tpl
View File

@ -1,5 +1,5 @@
{{#each channels}} {{#each channels}}
<div data-id="{{id}}" data-target="#chan-{{id}}" data-title="{{name}}" class="chan {{type}}"> <div data-id="{{id}}" data-target="#chan-{{id}}" data-title="{{name}}" class="chan {{type}} chan-{{slugify name}}">
<span class="badge{{#if highlight}} highlight{{/if}}">{{#if unread}}{{roundBadgeNumber unread}}{{/if}}</span> <span class="badge{{#if highlight}} highlight{{/if}}">{{#if unread}}{{roundBadgeNumber unread}}{{/if}}</span>
<button class="close" aria-label="Close"></button> <button class="close" aria-label="Close"></button>
<span class="name" title="{{name}}">{{name}}</span> <span class="name" title="{{name}}">{{name}}</span>

2
client/views/msg_unhandled.tpl
View File

@ -1,4 +1,4 @@
<div class="msg {{type}}{{#if self}} self{{/if}}{{#if highlight}} highlight{{/if}}" data-time="{{time}}"> <div class="msg msg-{{slugify command}} {{type}}{{#if self}} self{{/if}}{{#if highlight}} highlight{{/if}}" data-time="{{time}}">
<span class="time tooltipped tooltipped-e" aria-label="{{localetime time}}"> <span class="time tooltipped tooltipped-e" aria-label="{{localetime time}}">
{{tz time}} {{tz time}}
</span> </span>

2
client/views/network.tpl
View File

@ -1,5 +1,5 @@
{{#each networks}} {{#each networks}}
<section id="network-{{id}}" class="network" data-id="{{id}}" data-nick="{{nick}}" data-options="{{tojson serverOptions}}"> <section id="network-{{id}}" class="network name-{{slugify name}} network-{{slugify serverOptions.NETWORK}}" data-id="{{id}}" data-nick="{{nick}}" data-options="{{tojson serverOptions}}">
{{> chan}} {{> chan}}
</section> </section>
{{/each}} {{/each}}

1
src/models/network.js
View File

@ -25,6 +25,7 @@ function Network(attr) {
irc: null, irc: null,
serverOptions: { serverOptions: {
PREFIX: [], PREFIX: [],
NETWORK: "",
}, },
chanCache: [], chanCache: [],
}); });

3
src/plugins/irc-events/connection.js
View File

@ -120,7 +120,7 @@ module.exports = function(irc, network) {
}); });
irc.on("server options", function(data) { irc.on("server options", function(data) {
if (network.serverOptions.PREFIX === data.options.PREFIX) { if (network.serverOptions.PREFIX === data.options.PREFIX && network.serverOptions.NETWORK === data.options.NETWORK) {
return; return;
} }
@ -131,6 +131,7 @@ module.exports = function(irc, network) {
}); });
network.serverOptions.PREFIX = data.options.PREFIX; network.serverOptions.PREFIX = data.options.PREFIX;
network.serverOptions.NETWORK = data.options.NETWORK;
client.emit("network_changed", { client.emit("network_changed", {
network: network.id, network: network.id,