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

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
commit 056b696b36
2 changed files with 1 additions and 5 deletions

View File

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

View File

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