From b43bf42efcb8df24f39358d2ee770cf2e23bec0d Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 24 Jun 2019 15:31:11 +0200
Subject: [PATCH] Revert "Fixed broken logging"
This reverts commit 68b21d706c750352fc5672595f595bd50286b5ae.
---
api/config/settings/common.py | 2 +-
api/funkwhale_api/manage/filters.py | 12 +----
.../dynamic_preferences_registry.py | 4 +-
.../manage/moderation/DomainsTable.vue | 25 ++--------
front/src/views/admin/Settings.vue | 9 ----
front/src/views/admin/moderation/Base.vue | 23 +--------
.../views/admin/moderation/DomainsDetail.vue | 49 +------------------
.../views/admin/moderation/DomainsList.vue | 10 +---
8 files changed, 13 insertions(+), 121 deletions(-)
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 455a5822..8f2e00ad 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -46,7 +46,7 @@ logging.config.dictConfig(
},
"loggers": {
"funkwhale_api": {
- "level": logging.getLevelName("LOGLEVEL"),
+ "level": LOGLEVEL,
"handlers": ["console"],
# required to avoid double logging with root logger
"propagate": False,
diff --git a/api/funkwhale_api/manage/filters.py b/api/funkwhale_api/manage/filters.py
index 9e20a6af..984b8313 100644
--- a/api/funkwhale_api/manage/filters.py
+++ b/api/funkwhale_api/manage/filters.py
@@ -237,20 +237,10 @@ class ManageUploadFilterSet(filters.FilterSet):
class ManageDomainFilterSet(filters.FilterSet):
q = fields.SearchFilter(search_fields=["name"])
- allowed = filters.BooleanFilter()
class Meta:
model = federation_models.Domain
- fields = ["name", "allowed"]
-
- def filter_allowed(self, qs, value):
- """
- If value=false, we want to include object with value=null as well
- """
- if value:
- return qs.filter(allowed=True)
- else:
- return qs.filter(allowed__in=[False, None])
+ fields = ["name"]
class ManageActorFilterSet(filters.FilterSet):
diff --git a/api/funkwhale_api/moderation/dynamic_preferences_registry.py b/api/funkwhale_api/moderation/dynamic_preferences_registry.py
index 04a732f4..8d8237cb 100644
--- a/api/funkwhale_api/moderation/dynamic_preferences_registry.py
+++ b/api/funkwhale_api/moderation/dynamic_preferences_registry.py
@@ -19,8 +19,8 @@ class AllowListPublic(types.BooleanPreference):
name = "allow_list_public"
verbose_name = "Publish your allowed-domains list"
help_text = (
- "If enabled, everyone will be able to retrieve the list of domains you allowed. "
+ "If enabled, everyone will be able to retrieve the list of domains you allowed. ",
"This is useful on open setups, to help people decide if they want to join your pod, or to "
- "make your moderation policy public."
+ "make your moderation policy public.",
)
default = False
diff --git a/front/src/components/manage/moderation/DomainsTable.vue b/front/src/components/manage/moderation/DomainsTable.vue
index 08fff4cc..544d9115 100644
--- a/front/src/components/manage/moderation/DomainsTable.vue
+++ b/front/src/components/manage/moderation/DomainsTable.vue
@@ -6,14 +6,6 @@
<label><translate translate-context="Content/Search/Input.Label/Noun">Search</translate></label>
<input name="search" type="text" v-model="search" :placeholder="labels.searchPlaceholder" />
</div>
- <div class="field">
- <label><translate translate-context="Content/Moderation/*/Adjective">Is present on allow-list</translate></label>
- <select class="ui dropdown" v-model="allowed">
- <option :value="null"><translate translate-context="*/*/*">All</translate></option>
- <option :value="true"><translate translate-context="*/*/*">Yes</translate></option>
- <option :value="false"><translate translate-context="*/*/*">No</translate></option>
- </select>
- </div>
<div class="field">
<label><translate translate-context="Content/Search/Dropdown.Label/Noun">Ordering</translate></label>
<select class="ui dropdown" v-model="ordering">
@@ -101,8 +93,7 @@ import TranslationsMixin from '@/components/mixins/Translations'
export default {
mixins: [OrderingMixin, TranslationsMixin],
props: {
- filters: {type: Object, required: false},
- allowListEnabled: {type: Boolean, default: false},
+ filters: {type: Object, required: false}
},
components: {
Pagination,
@@ -117,7 +108,6 @@ export default {
page: 1,
paginateBy: 50,
search: '',
- allowed: null,
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [
@@ -134,16 +124,12 @@ export default {
},
methods: {
fetchData () {
- let baseFilters = {
+ let params = _.merge({
'page': this.page,
'page_size': this.paginateBy,
'q': this.search,
- 'ordering': this.getOrderingAsString(),
- }
- if (this.allowed !== null) {
- baseFilters.allowed = this.allowed
- }
- let params = _.merge(baseFilters, this.filters)
+ 'ordering': this.getOrderingAsString()
+ }, this.filters)
let self = this
self.isLoading = true
self.checked = []
@@ -193,9 +179,6 @@ export default {
page () {
this.fetchData()
},
- allowed () {
- this.fetchData()
- },
ordering () {
this.fetchData()
},
diff --git a/front/src/views/admin/Settings.vue b/front/src/views/admin/Settings.vue
index a1d03aab..7102fb31 100644
--- a/front/src/views/admin/Settings.vue
+++ b/front/src/views/admin/Settings.vue
@@ -82,7 +82,6 @@ export default {
let musicLabel = this.$pgettext('*/*/*/Noun', 'Music')
let playlistsLabel = this.$pgettext('*/*/*', 'Playlists')
let federationLabel = this.$pgettext('Content/Admin/Menu', 'Federation')
- let moderationLabel = this.$pgettext('Content/Admin/Menu', 'Moderation')
let subsonicLabel = this.$pgettext('Content/Admin/Menu', 'Subsonic')
let statisticsLabel = this.$pgettext('Content/Admin/Menu', 'Statistics')
let errorLabel = this.$pgettext('Content/Admin/Menu', 'Error reporting')
@@ -119,14 +118,6 @@ export default {
id: "playlists",
settings: ["playlists__max_tracks"]
},
- {
- label: moderationLabel,
- id: "moderation",
- settings: [
- "moderation__allow_list_enabled",
- "moderation__allow_list_public",
- ]
- },
{
label: federationLabel,
id: "federation",
diff --git a/front/src/views/admin/moderation/Base.vue b/front/src/views/admin/moderation/Base.vue
index d1c3ae29..564debf7 100644
--- a/front/src/views/admin/moderation/Base.vue
+++ b/front/src/views/admin/moderation/Base.vue
@@ -9,31 +9,12 @@
:to="{name: 'manage.moderation.accounts.list'}"><translate translate-context="*/Moderation/Title">Accounts</translate></router-link>
</nav>
- <router-view :allow-list-enabled="allowListEnabled" :key="$route.fullPath"></router-view>
+ <router-view :key="$route.fullPath"></router-view>
</div>
</template>
<script>
-import _ from '@/lodash'
-import axios from 'axios'
-
export default {
- data () {
- return {
- allowListEnabled: false
- }
- },
- created () {
- this.fetchNodeInfo()
- },
- methods: {
- fetchNodeInfo () {
- let self = this
- axios.get('instance/nodeinfo/2.0/').then(response => {
- self.allowListEnabled = _.get(response.data, 'metadata.allowList.enabled', false)
- })
- },
- },
computed: {
labels() {
return {
@@ -41,6 +22,6 @@ export default {
secondaryMenu: this.$pgettext('Menu/*/Hidden text', "Secondary menu")
}
}
- },
+ }
}
</script>
diff --git a/front/src/views/admin/moderation/DomainsDetail.vue b/front/src/views/admin/moderation/DomainsDetail.vue
index c30f426b..575b15f9 100644
--- a/front/src/views/admin/moderation/DomainsDetail.vue
+++ b/front/src/views/admin/moderation/DomainsDetail.vue
@@ -20,34 +20,6 @@
</div>
</div>
</h2>
- <div class="header-buttons">
- <div class="ui icon buttons">
- <a
- v-if="$store.state.auth.profile.is_superuser"
- class="ui labeled icon button"
- :href="$store.getters['instance/absoluteUrl'](`/api/admin/federation/domain/${object.name}`)"
- target="_blank" rel="noopener noreferrer">
- <i class="wrench icon"></i>
- <translate translate-context="Content/Moderation/Link/Verb">View in Django's admin</translate>
- </a>
- </div>
- <div v-if="allowListEnabled" class="ui icon buttons">
- <button
- v-if="object.allowed"
- @click.prevent="setAllowList(false)"
- :class="['ui', 'labeled', {loading: isLoadingAllowList}, 'icon', 'button']">
- <i class="x icon"></i>
- <translate translate-context="Content/Moderation/Link/Verb">Remove from allow-list</translate>
- </button>
- <button
- v-else
- @click.prevent="setAllowList(true)"
- :class="['ui', 'labeled', {loading: isLoadingAllowList}, 'icon', 'button']">
- <i class="check icon"></i>
- <translate translate-context="Content/Moderation/Link/Verb">Add to allow-list</translate>
- </button>
- </div>
- </div>
</div>
</div>
<div class="ui column">
@@ -102,15 +74,6 @@
</h3>
<table class="ui very basic table">
<tbody>
- <tr v-if="allowListEnabled">
- <td>
- <translate translate-context="Content/Moderation/*/Adjective">Is present on allow-list</translate>
- </td>
- <td>
- <translate v-if="object.allowed" translate-context="*/*/*">Yes</translate>
- <translate v-else translate-context="*/*/*">No</translate>
- </td>
- </tr>
<tr>
<td>
<translate translate-context="Content/*/Table.Label">Last checked</translate>
@@ -337,7 +300,7 @@ import InstancePolicyForm from "@/components/manage/moderation/InstancePolicyFor
import InstancePolicyCard from "@/components/manage/moderation/InstancePolicyCard"
export default {
- props: ["id", "allowListEnabled"],
+ props: ["id"],
components: {
InstancePolicyForm,
InstancePolicyCard,
@@ -348,7 +311,6 @@ export default {
isLoading: true,
isLoadingStats: false,
isLoadingPolicy: false,
- isLoadingAllowList: false,
policy: null,
object: null,
stats: null,
@@ -391,15 +353,6 @@ export default {
self.isLoadingPolicy = false
})
},
- setAllowList(value) {
- var self = this
- this.isLoadingAllowList = true
- let url = `manage/federation/domains/${this.id}/`
- axios.patch(url, {allowed: value}).then(response => {
- self.object = response.data
- self.isLoadingAllowList = false
- })
- },
refreshNodeInfo (data) {
this.object.nodeinfo = data
this.object.nodeinfo_fetch_date = new Date()
diff --git a/front/src/views/admin/moderation/DomainsList.vue b/front/src/views/admin/moderation/DomainsList.vue
index b4ffad7b..3ce8e6af 100644
--- a/front/src/views/admin/moderation/DomainsList.vue
+++ b/front/src/views/admin/moderation/DomainsList.vue
@@ -14,10 +14,6 @@
<label for="domain"><translate translate-context="Content/Moderation/Form.Label/Verb">Add a domain</translate></label>
<input type="text" name="domain" id="domain" v-model="domainName">
</div>
- <div class="field" v-if="allowListEnabled">
- <input type="checkbox" name="allowed" id="allowed" v-model="domainAllowed">
- <label for="allowed"><translate translate-context="Content/Moderation/Form.Label/Verb">Add to allow-list</translate></label>
- </div>
<div class="field">
<button :class="['ui', {'loading': isCreating}, 'green', 'button']" type="submit" :disabled="isCreating">
<label for="domain"><translate translate-context="Content/Moderation/Button/Verb">Add</translate></label>
@@ -26,7 +22,7 @@
</div>
</form>
<div class="ui clearing hidden divider"></div>
- <domains-table :allow-list-enabled="allowListEnabled"></domains-table>
+ <domains-table></domains-table>
</section>
</main>
</template>
@@ -36,14 +32,12 @@ import axios from 'axios'
import DomainsTable from "@/components/manage/moderation/DomainsTable"
export default {
- props: ['allowListEnabled'],
components: {
DomainsTable
},
data () {
return {
domainName: '',
- domainAllowed: this.allowListEnabled ? true : null,
isCreating: false,
errors: []
}
@@ -60,7 +54,7 @@ export default {
let self = this
this.isCreating = true
this.errors = []
- axios.post('manage/federation/domains/', {name: this.domainName, allowed: this.domainAllowed}).then((response) => {
+ axios.post('manage/federation/domains/', {name: this.domainName}).then((response) => {
this.isCreating = false
this.$router.push({
name: "manage.moderation.domains.detail",
--
GitLab