tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity

Merge branch 'bug/set-mastodon-relay-subscribers-as-instances' into 'master'

Browse source 
Show Mastodon relay subscribers as instances in admin panel

See merge request framasoft/mobilizon!362
This commit is contained in:
Thomas Citharel 2019-12-17 17:25:35 +01:00
parent 89fb46de67 4a8fb41fd1
commit 056b696b36
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/src/mixins/relay.ts
View file

@ -39,6 +39,6 @@ export default class RelayMixin extends Vue {
} }
isInstance(actor: IActor): boolean { isInstance(actor: IActor): boolean {
return actor.type === ActorType.APPLICATION && actor.preferredUsername === 'relay'; return actor.type === ActorType.APPLICATION && (actor.preferredUsername === 'relay' || actor.preferredUsername === actor.domain);
} }
} }

4
js/src/views/Moderation/Logs.vue
View file

@ -65,10 +65,6 @@ export default class ReportList extends Vue {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.container li {
margin: 10px auto;
}
img.image { img.image {
display: inline; display: inline;
height: 1.5em; height: 1.5em;