cleanup old files
This commit is contained in:
f0x
parent
5a96f23ff7
commit
ca0fb02330
|
|
@ -1,282 +0,0 @@
|
||||||
/*
|
|
||||||
GoToSocial
|
|
||||||
Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
const Promise = require("bluebird");
|
|
||||||
const React = require("react");
|
|
||||||
const Redux = require("react-redux");
|
|
||||||
const { Switch, Route, Link, Redirect, useRoute, useLocation } = require("wouter");
|
|
||||||
const fileDownload = require("js-file-download");
|
|
||||||
|
|
||||||
const { formFields } = require("../components/form-fields");
|
|
||||||
|
|
||||||
const api = require("../lib/api");
|
|
||||||
const adminActions = require("../redux/reducers/admin").actions;
|
|
||||||
const submit = require("../lib/submit");
|
|
||||||
const BackButton = require("../components/back-button");
|
|
||||||
const Loading = require("../components/loading");
|
|
||||||
const { matchSorter } = require("match-sorter");
|
|
||||||
|
|
||||||
const base = "/settings/admin/federation";
|
|
||||||
|
|
||||||
module.exports = function AdminSettings() {
|
|
||||||
const dispatch = Redux.useDispatch();
|
|
||||||
const loadedBlockedInstances = Redux.useSelector(state => state.admin.loadedBlockedInstances);
|
|
||||||
|
|
||||||
React.useEffect(() => {
|
|
||||||
if (!loadedBlockedInstances) {
|
|
||||||
Promise.try(() => {
|
|
||||||
return dispatch(api.admin.fetchDomainBlocks());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}, [dispatch, loadedBlockedInstances]);
|
|
||||||
|
|
||||||
if (!loadedBlockedInstances) {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<h1>Federation</h1>
|
|
||||||
<div>
|
|
||||||
<Loading />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Switch>
|
|
||||||
<Route path={`${base}/:domain`}>
|
|
||||||
<InstancePageWrapped />
|
|
||||||
</Route>
|
|
||||||
<InstanceOverview />
|
|
||||||
</Switch>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
function InstanceOverview() {
|
|
||||||
const [filter, setFilter] = React.useState("");
|
|
||||||
const blockedInstances = Redux.useSelector(state => state.admin.blockedInstances);
|
|
||||||
const [_location, setLocation] = useLocation();
|
|
||||||
|
|
||||||
const filteredInstances = React.useMemo(() => {
|
|
||||||
return matchSorter(Object.values(blockedInstances), filter, { keys: ["domain"] });
|
|
||||||
}, [blockedInstances, filter]);
|
|
||||||
|
|
||||||
function filterFormSubmit(e) {
|
|
||||||
e.preventDefault();
|
|
||||||
setLocation(`${base}/${filter}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<h1>Federation</h1>
|
|
||||||
Here you can see an overview of blocked instances.
|
|
||||||
|
|
||||||
<div className="instance-list">
|
|
||||||
<h2>Blocked instances</h2>
|
|
||||||
<form action={`${base}/view`} className="filter" role="search" onSubmit={filterFormSubmit}>
|
|
||||||
<input name="domain" value={filter} onChange={(e) => setFilter(e.target.value)} />
|
|
||||||
<Link to={`${base}/${filter}`}><a className="button">Add block</a></Link>
|
|
||||||
</form>
|
|
||||||
<div className="list scrolling">
|
|
||||||
{filteredInstances.map((entry) => {
|
|
||||||
return (
|
|
||||||
<Link key={entry.domain} to={`${base}/${entry.domain}`}>
|
|
||||||
<a className="entry nounderline">
|
|
||||||
<span id="domain">
|
|
||||||
{entry.domain}
|
|
||||||
</span>
|
|
||||||
<span id="date">
|
|
||||||
{new Date(entry.created_at).toLocaleString()}
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
</Link>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<BulkBlocking />
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const Bulk = formFields(adminActions.updateBulkBlockVal, (state) => state.admin.bulkBlock);
|
|
||||||
function BulkBlocking() {
|
|
||||||
const dispatch = Redux.useDispatch();
|
|
||||||
const { bulkBlock, blockedInstances } = Redux.useSelector(state => state.admin);
|
|
||||||
|
|
||||||
const [errorMsg, setError] = React.useState("");
|
|
||||||
const [statusMsg, setStatus] = React.useState("");
|
|
||||||
|
|
||||||
function importBlocks() {
|
|
||||||
setStatus("Processing");
|
|
||||||
setError("");
|
|
||||||
return Promise.try(() => {
|
|
||||||
return dispatch(api.admin.bulkDomainBlock());
|
|
||||||
}).then(({ success, invalidDomains }) => {
|
|
||||||
return Promise.try(() => {
|
|
||||||
return resetBulk();
|
|
||||||
}).then(() => {
|
|
||||||
dispatch(adminActions.updateBulkBlockVal(["list", invalidDomains.join("\n")]));
|
|
||||||
|
|
||||||
let stat = "";
|
|
||||||
if (success == 0) {
|
|
||||||
return setError("No valid domains in import");
|
|
||||||
} else if (success == 1) {
|
|
||||||
stat = "Imported 1 domain";
|
|
||||||
} else {
|
|
||||||
stat = `Imported ${success} domains`;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (invalidDomains.length > 0) {
|
|
||||||
if (invalidDomains.length == 1) {
|
|
||||||
stat += ", input contained 1 invalid domain.";
|
|
||||||
} else {
|
|
||||||
stat += `, input contained ${invalidDomains.length} invalid domains.`;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
stat += "!";
|
|
||||||
}
|
|
||||||
|
|
||||||
setStatus(stat);
|
|
||||||
});
|
|
||||||
}).catch((e) => {
|
|
||||||
setError(e.message);
|
|
||||||
setStatus("");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function exportBlocks() {
|
|
||||||
return Promise.try(() => {
|
|
||||||
setStatus("Exporting");
|
|
||||||
setError("");
|
|
||||||
let asJSON = bulkBlock.exportType.startsWith("json");
|
|
||||||
let _asCSV = bulkBlock.exportType.startsWith("csv");
|
|
||||||
|
|
||||||
let exportList = Object.values(blockedInstances).map((entry) => {
|
|
||||||
if (asJSON) {
|
|
||||||
return {
|
|
||||||
domain: entry.domain,
|
|
||||||
public_comment: entry.public_comment
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
return entry.domain;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (bulkBlock.exportType == "json") {
|
|
||||||
return dispatch(adminActions.updateBulkBlockVal(["list", JSON.stringify(exportList)]));
|
|
||||||
} else if (bulkBlock.exportType == "json-download") {
|
|
||||||
return fileDownload(JSON.stringify(exportList), "block-export.json");
|
|
||||||
} else if (bulkBlock.exportType == "plain") {
|
|
||||||
return dispatch(adminActions.updateBulkBlockVal(["list", exportList.join("\n")]));
|
|
||||||
}
|
|
||||||
}).then(() => {
|
|
||||||
setStatus("Exported!");
|
|
||||||
}).catch((e) => {
|
|
||||||
setError(e.message);
|
|
||||||
setStatus("");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function resetBulk(e) {
|
|
||||||
if (e != undefined) {
|
|
||||||
e.preventDefault();
|
|
||||||
}
|
|
||||||
return dispatch(adminActions.resetBulkBlockVal());
|
|
||||||
}
|
|
||||||
|
|
||||||
function disableInfoFields(props = {}) {
|
|
||||||
if (bulkBlock.list[0] == "[") {
|
|
||||||
return {
|
|
||||||
...props,
|
|
||||||
disabled: true,
|
|
||||||
placeHolder: "Domain list is a JSON import, input disabled"
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
return props;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="bulk">
|
|
||||||
<h2>Import / Export <a onClick={resetBulk}>reset</a></h2>
|
|
||||||
<Bulk.TextArea
|
|
||||||
id="list"
|
|
||||||
name="Domains, one per line"
|
|
||||||
placeHolder={`google.com\nfacebook.com`}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Bulk.TextArea
|
|
||||||
id="public_comment"
|
|
||||||
name="Public comment"
|
|
||||||
inputProps={disableInfoFields({ rows: 3 })}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Bulk.TextArea
|
|
||||||
id="private_comment"
|
|
||||||
name="Private comment"
|
|
||||||
inputProps={disableInfoFields({ rows: 3 })}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Bulk.Checkbox
|
|
||||||
id="obfuscate"
|
|
||||||
name="Obfuscate domains? "
|
|
||||||
inputProps={disableInfoFields()}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div className="hidden">
|
|
||||||
<Bulk.File
|
|
||||||
id="json"
|
|
||||||
fileType="application/json"
|
|
||||||
withPreview={false}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="messagebutton">
|
|
||||||
<div>
|
|
||||||
<button type="submit" onClick={importBlocks}>Import</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<button type="submit" onClick={exportBlocks}>Export</button>
|
|
||||||
|
|
||||||
<Bulk.Select id="exportType" name="Export type" options={
|
|
||||||
<>
|
|
||||||
<option value="plain">One per line in text field</option>
|
|
||||||
<option value="json">JSON in text field</option>
|
|
||||||
<option value="json-download">JSON file download</option>
|
|
||||||
<option disabled value="csv">CSV in text field (glitch-soc)</option>
|
|
||||||
<option disabled value="csv-download">CSV file download (glitch-soc)</option>
|
|
||||||
</>
|
|
||||||
} />
|
|
||||||
</div>
|
|
||||||
<br />
|
|
||||||
<div>
|
|
||||||
{errorMsg.length > 0 &&
|
|
||||||
<div className="error accent">{errorMsg}</div>
|
|
||||||
}
|
|
||||||
{statusMsg.length > 0 &&
|
|
||||||
<div className="accent">{statusMsg}</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
@ -1,167 +0,0 @@
|
||||||
/*
|
|
||||||
GoToSocial
|
|
||||||
Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
const React = require("react");
|
|
||||||
const Redux = require("react-redux");
|
|
||||||
const d = require("dotty");
|
|
||||||
const prettierBytes = require("prettier-bytes");
|
|
||||||
|
|
||||||
function eventListeners(dispatch, setter, obj) {
|
|
||||||
return {
|
|
||||||
onTextChange: function (key) {
|
|
||||||
return function (e) {
|
|
||||||
dispatch(setter([key, e.target.value]));
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
onCheckChange: function (key) {
|
|
||||||
return function (e) {
|
|
||||||
dispatch(setter([key, e.target.checked]));
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
onFileChange: function (key, withPreview) {
|
|
||||||
return function (e) {
|
|
||||||
let file = e.target.files[0];
|
|
||||||
if (withPreview) {
|
|
||||||
let old = d.get(obj, key);
|
|
||||||
if (old != undefined) {
|
|
||||||
URL.revokeObjectURL(old); // no error revoking a non-Object URL as provided by instance
|
|
||||||
}
|
|
||||||
let objectURL = URL.createObjectURL(file);
|
|
||||||
dispatch(setter([key, objectURL]));
|
|
||||||
}
|
|
||||||
dispatch(setter([`${key}File`, file]));
|
|
||||||
};
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function get(state, id, defaultVal) {
|
|
||||||
let value;
|
|
||||||
if (id.includes(".")) {
|
|
||||||
value = d.get(state, id);
|
|
||||||
} else {
|
|
||||||
value = state[id];
|
|
||||||
}
|
|
||||||
if (value == undefined) {
|
|
||||||
value = defaultVal;
|
|
||||||
}
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
// function removeFile(name) {
|
|
||||||
// return function(e) {
|
|
||||||
// e.preventDefault();
|
|
||||||
// dispatch(user.setProfileVal([name, ""]));
|
|
||||||
// dispatch(user.setProfileVal([`${name}File`, ""]));
|
|
||||||
// };
|
|
||||||
// }
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
formFields: function formFields(setter, selector) {
|
|
||||||
function FormField({
|
|
||||||
type, id, name, className="", placeHolder="", fileType="", children=null,
|
|
||||||
options=null, inputProps={}, withPreview=true, showSize=false, maxSize=Infinity
|
|
||||||
}) {
|
|
||||||
const dispatch = Redux.useDispatch();
|
|
||||||
let state = Redux.useSelector(selector);
|
|
||||||
let {
|
|
||||||
onTextChange,
|
|
||||||
onCheckChange,
|
|
||||||
onFileChange
|
|
||||||
} = eventListeners(dispatch, setter, state);
|
|
||||||
|
|
||||||
let field;
|
|
||||||
let defaultLabel = true;
|
|
||||||
if (type == "text") {
|
|
||||||
field = <input type="text" id={id} value={get(state, id, "")} placeholder={placeHolder} className={className} onChange={onTextChange(id)} {...inputProps}/>;
|
|
||||||
} else if (type == "textarea") {
|
|
||||||
field = <textarea type="text" id={id} value={get(state, id, "")} placeholder={placeHolder} className={className} onChange={onTextChange(id)} rows={8} {...inputProps}/>;
|
|
||||||
} else if (type == "checkbox") {
|
|
||||||
field = <input type="checkbox" id={id} checked={get(state, id, false)} className={className} onChange={onCheckChange(id)} {...inputProps}/>;
|
|
||||||
} else if (type == "select") {
|
|
||||||
field = (
|
|
||||||
<select id={id} value={get(state, id, "")} className={className} onChange={onTextChange(id)} {...inputProps}>
|
|
||||||
{options}
|
|
||||||
</select>
|
|
||||||
);
|
|
||||||
} else if (type == "file") {
|
|
||||||
defaultLabel = false;
|
|
||||||
let file = get(state, `${id}File`);
|
|
||||||
|
|
||||||
let size = null;
|
|
||||||
if (showSize && file) {
|
|
||||||
size = `(${prettierBytes(file.size)})`;
|
|
||||||
|
|
||||||
if (file.size > maxSize) {
|
|
||||||
size = <span className="error-text">{size}</span>;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
field = (
|
|
||||||
<>
|
|
||||||
<label htmlFor={id} className="file-input button">Browse</label>
|
|
||||||
<span className="form-info">
|
|
||||||
{file ? file.name : "no file selected"} {size}
|
|
||||||
</span>
|
|
||||||
{/* <a onClick={removeFile("header")}>remove</a> */}
|
|
||||||
<input className="hidden" id={id} type="file" accept={fileType} onChange={onFileChange(id, withPreview)} {...inputProps}/>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
defaultLabel = false;
|
|
||||||
field = `unsupported FormField ${type}, this is a developer error`;
|
|
||||||
}
|
|
||||||
|
|
||||||
let label = <label htmlFor={id}>{name}</label>;
|
|
||||||
return (
|
|
||||||
<div className={`form-field ${type}`}>
|
|
||||||
{defaultLabel ? label : null} {field}
|
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
TextInput: function(props) {
|
|
||||||
return <FormField type="text" {...props} />;
|
|
||||||
},
|
|
||||||
|
|
||||||
TextArea: function(props) {
|
|
||||||
return <FormField type="textarea" {...props} />;
|
|
||||||
},
|
|
||||||
|
|
||||||
Checkbox: function(props) {
|
|
||||||
return <FormField type="checkbox" {...props} />;
|
|
||||||
},
|
|
||||||
|
|
||||||
Select: function(props) {
|
|
||||||
return <FormField type="select" {...props} />;
|
|
||||||
},
|
|
||||||
|
|
||||||
File: function(props) {
|
|
||||||
return <FormField type="file" {...props} />;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
eventListeners
|
|
||||||
};
|
|
||||||
|
|
@ -1,138 +0,0 @@
|
||||||
/*
|
|
||||||
GoToSocial
|
|
||||||
Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
const Promise = require("bluebird");
|
|
||||||
const isValidDomain = require("is-valid-domain");
|
|
||||||
|
|
||||||
const admin = require("../../redux/reducers/admin").actions;
|
|
||||||
|
|
||||||
module.exports = function ({ apiCall, getChanges }) {
|
|
||||||
const adminAPI = {
|
|
||||||
fetchDomainBlocks: function fetchDomainBlocks() {
|
|
||||||
return function (dispatch, _getState) {
|
|
||||||
return Promise.try(() => {
|
|
||||||
return dispatch(apiCall("GET", "/api/v1/admin/domain_blocks"));
|
|
||||||
}).then((data) => {
|
|
||||||
return dispatch(admin.setBlockedInstances(data));
|
|
||||||
});
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
updateDomainBlock: function updateDomainBlock(domain) {
|
|
||||||
return function (dispatch, getState) {
|
|
||||||
return Promise.try(() => {
|
|
||||||
const state = getState().admin.newInstanceBlocks[domain];
|
|
||||||
const update = getChanges(state, {
|
|
||||||
formKeys: ["domain", "obfuscate", "public_comment", "private_comment"],
|
|
||||||
});
|
|
||||||
|
|
||||||
return dispatch(apiCall("POST", "/api/v1/admin/domain_blocks", update, "form"));
|
|
||||||
}).then((block) => {
|
|
||||||
return Promise.all([
|
|
||||||
dispatch(admin.newDomainBlock([domain, block])),
|
|
||||||
dispatch(admin.setDomainBlock([domain, block]))
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
getEditableDomainBlock: function getEditableDomainBlock(domain) {
|
|
||||||
return function (dispatch, getState) {
|
|
||||||
let data = getState().admin.blockedInstances[domain];
|
|
||||||
return dispatch(admin.newDomainBlock([domain, data]));
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
bulkDomainBlock: function bulkDomainBlock() {
|
|
||||||
return function (dispatch, getState) {
|
|
||||||
let invalidDomains = [];
|
|
||||||
let success = 0;
|
|
||||||
|
|
||||||
return Promise.try(() => {
|
|
||||||
const state = getState().admin.bulkBlock;
|
|
||||||
let list = state.list;
|
|
||||||
let domains;
|
|
||||||
|
|
||||||
let fields = getChanges(state, {
|
|
||||||
formKeys: ["obfuscate", "public_comment", "private_comment"]
|
|
||||||
});
|
|
||||||
|
|
||||||
let defaultDate = new Date().toUTCString();
|
|
||||||
|
|
||||||
if (list[0] == "[") {
|
|
||||||
domains = JSON.parse(state.list);
|
|
||||||
} else {
|
|
||||||
domains = list.split("\n").map((line_) => {
|
|
||||||
let line = line_.trim();
|
|
||||||
if (line.length == 0) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isValidDomain(line, { wildcard: true, allowUnicode: true })) {
|
|
||||||
invalidDomains.push(line);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
domain: line,
|
|
||||||
created_at: defaultDate,
|
|
||||||
...fields
|
|
||||||
};
|
|
||||||
}).filter((a) => a != null);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (domains.length == 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const update = {
|
|
||||||
domains: new Blob([JSON.stringify(domains)], { type: "application/json" })
|
|
||||||
};
|
|
||||||
|
|
||||||
return dispatch(apiCall("POST", "/api/v1/admin/domain_blocks?import=true", update, "form"));
|
|
||||||
}).then((blocks) => {
|
|
||||||
if (blocks != undefined) {
|
|
||||||
return Promise.each(blocks, (block) => {
|
|
||||||
success += 1;
|
|
||||||
return dispatch(admin.setDomainBlock([block.domain, block]));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}).then(() => {
|
|
||||||
return {
|
|
||||||
success,
|
|
||||||
invalidDomains
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
removeDomainBlock: function removeDomainBlock(domain) {
|
|
||||||
return function (dispatch, getState) {
|
|
||||||
return Promise.try(() => {
|
|
||||||
const id = getState().admin.blockedInstances[domain].id;
|
|
||||||
return dispatch(apiCall("DELETE", `/api/v1/admin/domain_blocks/${id}`));
|
|
||||||
}).then((removed) => {
|
|
||||||
return dispatch(admin.removeDomainBlock(removed.domain));
|
|
||||||
});
|
|
||||||
};
|
|
||||||
},
|
|
||||||
};
|
|
||||||
return adminAPI;
|
|
||||||
};
|
|
||||||
|
|
@ -38,7 +38,6 @@ const combinedReducers = combineReducers({
|
||||||
instances: require("./reducers/instances").reducer,
|
instances: require("./reducers/instances").reducer,
|
||||||
temporary: require("./reducers/temporary").reducer,
|
temporary: require("./reducers/temporary").reducer,
|
||||||
user: require("./reducers/user").reducer,
|
user: require("./reducers/user").reducer,
|
||||||
admin: require("./reducers/admin").reducer,
|
|
||||||
[query.reducerPath]: query.reducer
|
[query.reducerPath]: query.reducer
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,99 +0,0 @@
|
||||||
/*
|
|
||||||
GoToSocial
|
|
||||||
Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
const { createSlice } = require("@reduxjs/toolkit");
|
|
||||||
|
|
||||||
function sortBlocks(blocks) {
|
|
||||||
return blocks.sort((a, b) => { // alphabetical sort
|
|
||||||
return a.domain.localeCompare(b.domain);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function emptyBlock() {
|
|
||||||
return {
|
|
||||||
public_comment: "",
|
|
||||||
private_comment: "",
|
|
||||||
obfuscate: false
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = createSlice({
|
|
||||||
name: "admin",
|
|
||||||
initialState: {
|
|
||||||
loadedBlockedInstances: false,
|
|
||||||
blockedInstances: undefined,
|
|
||||||
bulkBlock: {
|
|
||||||
list: "",
|
|
||||||
exportType: "plain",
|
|
||||||
...emptyBlock()
|
|
||||||
},
|
|
||||||
newInstanceBlocks: {}
|
|
||||||
},
|
|
||||||
reducers: {
|
|
||||||
setBlockedInstances: (state, { payload }) => {
|
|
||||||
state.blockedInstances = {};
|
|
||||||
sortBlocks(payload).forEach((entry) => {
|
|
||||||
state.blockedInstances[entry.domain] = entry;
|
|
||||||
});
|
|
||||||
state.loadedBlockedInstances = true;
|
|
||||||
},
|
|
||||||
|
|
||||||
newDomainBlock: (state, { payload: [domain, data] }) => {
|
|
||||||
if (data == undefined) {
|
|
||||||
data = {
|
|
||||||
new: true,
|
|
||||||
domain,
|
|
||||||
...emptyBlock()
|
|
||||||
};
|
|
||||||
}
|
|
||||||
state.newInstanceBlocks[domain] = data;
|
|
||||||
},
|
|
||||||
|
|
||||||
setDomainBlock: (state, { payload: [domain, data = {}] }) => {
|
|
||||||
state.blockedInstances[domain] = data;
|
|
||||||
},
|
|
||||||
|
|
||||||
removeDomainBlock: (state, {payload: domain}) => {
|
|
||||||
delete state.blockedInstances[domain];
|
|
||||||
},
|
|
||||||
|
|
||||||
updateDomainBlockVal: (state, { payload: [domain, key, val] }) => {
|
|
||||||
state.newInstanceBlocks[domain][key] = val;
|
|
||||||
},
|
|
||||||
|
|
||||||
updateBulkBlockVal: (state, { payload: [key, val] }) => {
|
|
||||||
state.bulkBlock[key] = val;
|
|
||||||
},
|
|
||||||
|
|
||||||
resetBulkBlockVal: (state, { _payload }) => {
|
|
||||||
state.bulkBlock = {
|
|
||||||
list: "",
|
|
||||||
exportType: "plain",
|
|
||||||
...emptyBlock()
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
exportToField: (state, { _payload }) => {
|
|
||||||
state.bulkBlock.list = Object.values(state.blockedInstances).map((entry) => {
|
|
||||||
return entry.domain;
|
|
||||||
}).join("\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
Loading…
Reference in New Issue