Skip to content

Commit

Permalink
refactor for blocking and additional flags. disconnect immediately to…
Browse files Browse the repository at this point in the history 
… blocked peers
  • Loading branch information
substack committed Jul 5, 2020
1 parent 5de7c59 commit ee626cd
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 43 deletions.
3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"qrcode": "^1.4.4",
"random-access-memory": "^3.1.1",
"strftime": "^0.10.0",
"to2": "^1.0.0"
"to2": "^1.0.0",
"uniq": "^1.0.1"
},
"devDependencies": {
"jsdoc-to-markdown": "^5.0.2",
Expand Down
4 changes: 4 additions & 0 deletions src/cabal-details.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,10 @@ class CabalDetails extends EventEmitter {
const changeOccurred = Object.keys(changedRole).filter(r => changedRole[r]).length > 0
if (!changeOccurred) {
this._emitUpdate('user-updated', { key: info.id, user })
if ((user.flags.get('@') || []).includes('block')) {
// drop the connection to blocked users immediately
this.core.removeConnection(info.id)
}
return
}
const type = doc.type.replace(/^flags\//, '')
Expand Down
12 changes: 11 additions & 1 deletion src/client.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,17 @@ class Client {
aliases: this.aliases
}, done)
this.cabals.set(cabal, details)
if (!opts.noSwarm) cabal.swarm()
if (!opts.noSwarm) cabal.swarm({
verify: function (remotePubKey, cb) {
cabal.moderation.getFlags({
id: remotePubKey.toString('hex'),
channel: '@'
}, function (err, flags) {
if (err) cb(err)
else cb(null, !flags.includes('block'))
})
}
})
function done () {
details._emitUpdate('init')
cb()
Expand Down
116 changes: 75 additions & 41 deletions src/commands.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const qr = require('qrcode')
const pump = require('pump')
const to = require('to2')
const strftime = require('strftime')
const uniq = require('uniq')

module.exports = {
add: {
Expand Down Expand Up @@ -328,8 +329,8 @@ module.exports = {
actions: {
help: () => 'print out a historic log of the moderation actions applied by you, and your active moderators & admins',
call: (cabal, res, arg) => {
const promises = [cabal.moderation.getAdmins(), cabal.moderation.getMods()]
// get all moderation actions issued by our current mods & admins
const promises = [cabal.moderation.getAdmins(), cabal.moderation.getMods()]
// get all moderation actions issued by our current mods & admins
const messages = []
function processMessages (messages) {
res.info('moderation actions')
Expand All @@ -341,7 +342,7 @@ module.exports = {
res.info(message.text)
})
}
Promise.all(promises).then(results => {
Promise.all(promises).then(results => {
const keys = results[0].concat(results[1])
listNextKey()
function listNextKey () {
Expand All @@ -350,30 +351,30 @@ module.exports = {
return res.end()
}
var key = keys.shift()
const write = (row, enc, next) => {
const write = (row, enc, next) => {
if (!row) return
const name = cabal.users[key] ? cabal.users[key].name : key.slice(0, 8)
const target = cabal.users[row.content.id] ? cabal.users[row.content.id].name : row.content.id.slice(0, 8)
const type = row.type.split('/')[1]
const reason = row.content.reason
const role = row.content.flags[0]
const datestr = strftime('[%F %T] ', new Date(row.timestamp))
let text, action
if (['admin', 'mod'].includes(role)) { action = (type === 'add' ? 'added' : 'removed') }
if (role === 'hide') { action = (type === 'add' ? 'hid' : 'unhid') }
if (role === 'hide') {
text = `${datestr} ${name} ${action} ${target} ${reason}`
} else {
text = `${datestr} ${name} ${action} ${target} as ${role} ${reason}`
}
const flags = row.content.flags
const datestr = strftime('[%F %T]', new Date(row.timestamp))
const action = {
add: 'added',
remove: 'removed',
set: 'set'
}[type]
text = `${datestr} ${name} ${
formatAction({ type, flags, id: target, cabal})
} ${reason ? ': ' + reason : ''}`
messages.push({ text, timestamp: parseFloat(row.timestamp) })
next()
}
const end = (next) => {
}
const end = (next) => {
listNextKey()
next()
}
pump(cabal.core.moderation.listModerationBy(key), to.obj(write, end))
pump(cabal.core.moderation.listModerationBy(key), to.obj(write, end))
}
})
}
Expand All @@ -385,9 +386,9 @@ module.exports = {
Promise.all(promises).then(results => {
const keys = results[0].concat(results[1])
const print = (type) => {
return (k) => {
return (k) => {
res.info(`${cabal.users[k] ? cabal.users[k].name : k.slice(0, 8)}: ${type}`)
}
}
}
res.info('moderation roles')
if (keys.length === 1 && keys[0] === cabal.getLocalUser().key) {
Expand Down Expand Up @@ -586,31 +587,34 @@ function flagCmd (cmd, cabal, res, arg) {
var type = /^un/.test(cmd) ? 'remove' : 'add'
var flag = cmd.replace(/^un/, '')
var reason = args.slice(1).join(' ')
const reasonstr = reason ? '(reason: ' + reason + ')' : ''
cabal.moderation.setFlag(flag, type, channel, id, reason).then(() => {
if (['admin', 'mod'].includes(flag)) {
if (/^un/.test(cmd) && flag === 'mod' && !cabal.users[id].isModerator()) {
res.error(`${getPeerName(cabal, id)} is not a mod`)
} else if (/^un/.test(cmd) && flag === 'admin' && !cabal.users[id].isAdmin()) {
res.error(`${getPeerName(cabal, id)} is not an admin`)
} else if (!/^un/.test(cmd) && flag === 'mod' && cabal.users[id].isModerator()) {
res.error(`${getPeerName(cabal, id)} is already a mod`)
} else if (!/^un/.test(cmd) && flag === 'admin' && cabal.users[id].isAdmin()) {
res.error(`${getPeerName(cabal, id)} is already an admin`)
}
cabal.core.moderation.getFlags({ id, channel }, function (err, flags) {
if (err) return res.error(err)
if (type === 'remove' && !flags.includes(flag)) {
res.error(`user ${getPeerName(cabal, id)} does not have the flag: ${flag}`)
} else if (type === 'add' && flags.includes(flag)) {
res.error(`user ${getPeerName(cabal, id)} already has the flag: ${flag}`)
} else {
if (/^un/.test(cmd)) {
if (!cabal.users[id].isHidden()) {
res.error(`cannot unhide ${getPeerName(cabal, id)}: they are not hidden`)
}
} else {
if (cabal.users[id].isHidden()) {
res.error(`${getPeerName(cabal, id)} is already hidden`)
}
if (type === 'add') {
flags.push(flag)
uniq(flags)
} else if (type === 'remove') {
uniq(flags)
var i = flags.indexOf(flag)
if (i >= 0) flags.splice(i, 1)
}
var fname = { add: 'addFlags', remove: 'removeFlags' }[type]
cabal.core.moderation[fname]({
id,
channel,
flags: [flag],
reason
}, function (err) {
if (err) return res.error(err)
//res.info(formatAction({ type, flags: [flag], id, cabal }))
res.end()
})
}
res.end()
}).catch((err) => { res.error(err) })
})
}

function listCmd (cmd, cabal, res, arg) {
Expand Down Expand Up @@ -645,3 +649,33 @@ function listCmd (cmd, cabal, res, arg) {
function ucfirst (s) {
return s.replace(/^[a-z]/, function (c) { return c.toUpperCase() })
}

function formatAction ({ cabal, type, flags, id }) {
var verb = {
add: 'added',
remove: 'removed',
set: 'set'
}[type]
if (type === 'set') {
return `${verb} flags [${flags}] for user ${getPeerName(cabal, id)}`
} else if (type === 'add' && flags.length === 1 && flags[0] === 'hide') {
return `hid user ${getPeerName(cabal, id)}`
} else if (type === 'remove' && flags.length === 1 && flags[0] === 'hide') {
return `unhid user ${getPeerName(cabal, id)}`
} else if (type === 'add' && flags.length === 1 && flags[0] === 'block') {
return `blocked user ${getPeerName(cabal, id)}`
} else if (type === 'remove' && flags.length === 1 && flags[0] === 'block') {
return `unblocked user ${getPeerName(cabal, id)}`
} else if (type === 'add' && flags.length === 1 && flags[0] === 'admin') {
return `added user ${getPeerName(cabal, id)} as admin`
} else if (type === 'remove' && flags.length === 1 && flags[0] === 'admin') {
return `removed user ${getPeerName(cabal, id)} as admin`
} else if (type === 'add' && flags.length === 1 && flags[0] === 'mod') {
return `added user ${getPeerName(cabal, id)} as mod`
} else if (type === 'remove' && flags.length === 1 && flags[0] === 'mod') {
return `removed user ${getPeerName(cabal, id)} as mod`
} else {
var flag = flags.length === 1 ? 'flag ' + flags[0] : 'flags ['+flags+']'
return `${verb} ${flag} for user ${getPeerName(cabal, id)}`
}
}

0 comments on commit ee626cd

Please sign in to comment.