wnagrodzki/fediplan
1
0
Fork 0
mirror of https://framagit.org/tom79/fediplan.git synced 2025-04-05 21:51:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix counters

Browse source
This commit is contained in:
Thomas 2024-05-11 16:27:26 +02:00
parent f3be249bef
commit b8873a277d
3 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
public/js/emojionearea.js
View file

@ -1400,13 +1400,14 @@ document = window.document || {};
self.editor.html(self.content = ''); self.editor.html(self.content = '');
} }
source[sourceValFunc](self.getText()); source[sourceValFunc](self.getText());
let inputText; var count = 0;
inputText = self.getText(); $('.emojionearea-editor').each(function() {
inputText = inputText var currentElement = $(this);
.replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '$1@$3') count += currentElement.text()
.replace(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g, 'xxxxxxxxxxxxxxxxxxxxxxx'); .replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '$1@$3')
.replace(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g, 'xxxxxxxxxxxxxxxxxxxxxxx').length;
$("#count").text(inputText.length); });
$("#count").text(count);
}); });
if (options.shortcuts) { if (options.shortcuts) {
self.on("@keydown", function(_, e) { self.on("@keydown", function(_, e) {
@ -1461,17 +1462,18 @@ document = window.document || {};
callback($.map(map, function (emoji) { callback($.map(map, function (emoji) {
return emoji.indexOf(term) === 0 ? emoji : null; return emoji.indexOf(term) === 0 ? emoji : null;
})); }));
} else if (term.startsWith("@")){ } else if (term.startsWith("@") && term.substring(1).length > 2){
$.ajax({ $.ajax({
url: "https://"+$('#data_api').attr('data-instance')+"/api/v2/search?type=accounts&q="+term.substring(1), url: "https://"+$('#data_api').attr('data-instance')+"/api/v2/search?type=accounts&q="+term.substring(1),
headers: {"Authorization": $('#data_api').attr('data-token')}, headers: {"Authorization": $('#data_api').attr('data-token')},
context: document.body context: document.body
}).done(function(value) { }).done(function(value) {
alert(value);
callback($.map(value.accounts, function (value) { callback($.map(value.accounts, function (value) {
return value; return value;
})); }));
}); });
}else if (term.startsWith("#")){ }else if (term.startsWith("#") && term.substring(1).length > 2){
$.ajax({ $.ajax({
url: "https://"+$('#data_api').attr('data-instance')+"/api/v2/search?type=hashtags&q="+term.substring(1), url: "https://"+$('#data_api').attr('data-instance')+"/api/v2/search?type=hashtags&q="+term.substring(1),
headers: {"Authorization": $('#data_api').attr('data-token')}, headers: {"Authorization": $('#data_api').attr('data-token')},

14
src/SocialEntity/Instance.php
View file

@ -54,6 +54,20 @@ class MediaAttachments {
$this->supported_mime_types = $supported_mime_types; $this->supported_mime_types = $supported_mime_types;
} }
public function getSupportedFiles() : string {
$values = "/(\.|\/)(gif|jpe?g|apng|png|mp4|mp3|avi|mov|webm|wmv|flv|wav|ogg)$/i";
if(isset($this->supported_mime_types) && count($this->supported_mime_types) >0) {
$values = "/(\.|\/)(";
foreach ($this->supported_mime_types as $value) {
$cleanedValue = preg_replace("#(image/)|(video/)|(audio/)#","",$value,);
if(!str_contains($cleanedValue, '.') && !str_contains($cleanedValue, '-')) {
$values .= $cleanedValue.'|';
}
}
$values .= "jpg)$/i";
}
return $values;
}
public function getImageSizeLimit(): int public function getImageSizeLimit(): int
{ {
return $this->image_size_limit; return $this->image_size_limit;

4
templates/fediplan/schedule.html.twig
View file

@ -56,7 +56,7 @@
<div class="row"> <div class="row">
<div class="col-md-4 col-4" style="margin-top: 20px;"> <div class="col-md-4 col-4" style="margin-top: 20px;">
<div class="form-inline has-feedback"> <div class="form-inline has-feedback">
<label for="count">{{ 'common.counter'|trans }}</label>&nbsp;&nbsp;<span id="count" class="form-control">0</span> <label for="count">{{ 'common.counter'|trans }}</label>&nbsp;&nbsp;<span id="count" >0</span>
&nbsp;/{{ instanceConfiguration.statuses.maxCharacters }} &nbsp;/{{ instanceConfiguration.statuses.maxCharacters }}
</div> </div>
</div> </div>
@ -437,7 +437,7 @@
$('#media_container').append($(content)); $('#media_container').append($(content));
}, },
acceptFileTypes: /(\.|\/)(gif|jpe?g|apng|png|mp4|mp3|avi|mov|webm|wmv|flv|wav|ogg)$/i acceptFileTypes: {{ app.session.get("instance").getConfiguration().getMediaAttachments().getSupportedFiles() }}
}); });
// Enable iframe cross-domain access via redirect option: // Enable iframe cross-domain access via redirect option: