doohoyi/chatty-pub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed chatty-pub-files url to be insecure

Browse source
This commit is contained in:
كارل مبارك 2023-09-15 15:20:23 +02:00
parent 3c320763fe
commit d64ce5261d
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/Content/Message.vue
View file

@ -21,7 +21,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="reactions ui"> <div class="reactions ui">
<span v-for="reaction in reactions" :key="reaction" :title="reaction"> <span v-for="reaction in reactions" :key="reaction" :title="reaction">
{{ shortcodeToEmoji(reaction) }} {{ shortcodeToEmoji(reaction) }}
@ -60,7 +60,7 @@ export default {
// with this: https://chatty-pub-files.hackersanddesigners.nl/files/ // with this: https://chatty-pub-files.hackersanddesigners.nl/files/
c = c.replaceAll( c = c.replaceAll(
url + "/user_uploads/", url + "/user_uploads/",
"https://chatty-pub-files.hackersanddesigners.nl/files/" "http://chatty-pub-files.hackersanddesigners.nl/files/"
); );
c = this.replaceAllEmojiCodes(c); c = this.replaceAllEmojiCodes(c);
@ -84,7 +84,7 @@ export default {
// console.log(c); // console.log(c);
}); });
return c; return c;
}, },
hasRulesShortcode(){ hasRulesShortcode(){

18
src/store/index.js
View file

@ -6,11 +6,11 @@ import { createStore } from 'vuex'
import emoji from "../mixins/emoji" import emoji from "../mixins/emoji"
import { stripHtml } from "string-strip-html" import { stripHtml } from "string-strip-html"
/* /*
TODO: fix this frankenfunction. Its not pretty but it works, so I am leaving it for now. TODO: fix this frankenfunction. Its not pretty but it works, so I am leaving it for now.
Does various conversion and parsing to turn a message in the rules channel into an object we can use in the rules and style component Does various conversion and parsing to turn a message in the rules channel into an object we can use in the rules and style component
*/ */
let toCSS = (message, currentStream) => { let toCSS = (message, currentStream) => {
@ -22,8 +22,8 @@ let toCSS = (message, currentStream) => {
id = message.id, id = message.id,
is_codeblock = message.content.includes("<code>") || message.content.startsWith("```"), is_codeblock = message.content.includes("<code>") || message.content.startsWith("```"),
is_font = /<p><a href=".+?\.(ttf|otf|woff)/gm.test(message.content); is_font = /<p><a href=".+?\.(ttf|otf|woff)/gm.test(message.content);
let type = is_codeblock ? "raw" : is_font ? "font" : "rule"; let type = is_codeblock ? "raw" : is_font ? "font" : "rule";
// console.log(type, message.content); // console.log(type, message.content);
let regex = /\s?(?<selector>.+)\s*\n?{\n?(?<props>(.*;\n?)+)}/gm let regex = /\s?(?<selector>.+)\s*\n?{\n?(?<props>(.*;\n?)+)}/gm
let results = content.matchAll(regex); let results = content.matchAll(regex);
@ -62,7 +62,7 @@ let font = (content) => {
let filename = getFilename(path); let filename = getFilename(path);
let ext = filename.split(".").pop(); let ext = filename.split(".").pop();
font.src = font.src =
"https://chatty-pub-files.hackersanddesigners.nl/files" + path; "http://chatty-pub-files.hackersanddesigners.nl/files" + path;
font.format = getFormat(ext); font.format = getFormat(ext);
font.family = filename.replace(".", "_"); font.family = filename.replace(".", "_");
return font; return font;
@ -230,7 +230,7 @@ export default createStore({
// id: mid, content: content, // id: mid, content: content,
// }, state.currentStream) // }, state.currentStream)
// vue will not update if i use rules.push(rule) // vue will not update if i use rules.push(rule)
state.rules.splice(state.rules.indexOf(rule), 1) state.rules.splice(state.rules.indexOf(rule), 1)
const newRules = [...state.rules, ...[toCSS({ const newRules = [...state.rules, ...[toCSS({
id: mid, content: content, id: mid, content: content,
@ -266,8 +266,8 @@ export default createStore({
sortedTopics: (state, getters) => ( sortedTopics: (state, getters) => (
getters.filteredTopics getters.filteredTopics
.sort((a,b) => .sort((a,b) =>
a.title.localeCompare(b.title, undefined, { a.title.localeCompare(b.title, undefined, {
numeric : true, numeric : true,
sensitivity : 'base' sensitivity : 'base'
}) })