git ssb - Fix name conflict · cel/patchfoo@d3244b38

cel committed on 10/14/2017, 12:15:05 AM
Parent: 0e7bd91590b8c9fc28113c785e39946943491719

changed

lib/app.jsView
		@@ -27,9 +27,9 @@
27	27 …
28	28 …	var conf = config.patchfoo \|\| {}
29	29 …	this.port = conf.port \|\| 8027
30	30 …	this.host = conf.host \|\| 'localhost'
31		- this.filter = conf.filter
	31 …	+ this.msgFilter = conf.filter
32	32 …
33	33 …	var base = conf.base \|\| '/'
34	34 …	this.opts = {
35	35 …	base: base,
		@@ -678,9 +678,9 @@
678	678 …	App.prototype.filterMsg = function (msg, opts, cb) {
679	679 …	var self = this
680	680 …	var myId = self.sbot.id
681	681 …	var author = msg.value && msg.value.author
682		- var filter = opts.filter \|\| self.filter
	682 …	+ var filter = opts.filter \|\| self.msgFilter
683	683 …	var show = (filter !== 'invert')
684	684 …	if (filter === 'all'
685	685 …	\|\| author === myId
686	686 …	\|\| author === opts.feed

cel / patchfoo