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

Some changes

Browse source
This commit is contained in:
Thomas 2020-05-01 18:29:02 +02:00
parent af3a7323ce
commit 65acc0295a
5 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -27,9 +27,5 @@ See: [Download Composer](https://getcomposer.org/download/)
Your site needs to target /path/to/FediPlan/public
#### TODO:
1. Polls
2. Autocompletion for mentions, tags and emojis
3. Check and edit scheduled statuses.
#### Support My work at [fedilab.app](https://fedilab.app/page/donations/)

9
crowdin.yml
View file

@ -2,6 +2,15 @@ files:
- source: /translations/fediplan.en.yaml
translation: /%original_path%/fediplan.%two_letters_code%.%file_extension%
update_option: update_without_changes
languages_mapping:
two_letters_code:
zh-TW: zh-TW
zh-CN: zh-CN
pt-PT: pt-PT
pt-BR: pt-BR
- source: /translations/fediplan+intl-icu.en.yaml
translation: /%original_path%/fediplan+intl-icu.%two_letters_code%.%file_extension%
update_option: update_without_changes
languages_mapping:
two_letters_code:
zh-TW: zh-TW

30
public/js/emojionearea.js
View file

@ -1430,7 +1430,7 @@ document = window.document || {};
editor.textcomplete([
{
id: css_class,
match: /\B((:[\-+\w]*)|(@[\-+\w]*))$/,
match: /\B((:[\-+\w]*)|(@[\-+\w]*)|(#[\-+\w]*))$/,
search: function (term, callback) {
if (term.startsWith(":")) {
@ -1443,27 +1443,41 @@ document = window.document || {};
headers: {"Authorization": $('#data_api').attr('data-token')},
context: document.body
}).done(function(value) {
// value = eval("(" + value + ")");
callback($.map(value.accounts, function (value) {
return value;
}));
});
}else if (term.startsWith("#")){
$.ajax({
url: "https://"+$('#data_api').attr('data-instance')+"/api/v2/search?type=hashtags&q="+term.substring(1),
headers: {"Authorization": $('#data_api').attr('data-token')},
context: document.body
}).done(function(value) {
callback($.map(value.hashtags, function (value) {
return value;
}));
});
}
},
template: function (value) {
if (typeof value.acct == 'undefined') {
return shortnameTo(value, self.emojiTemplate) + " " + value.replace(/:/g, '');
} else {
if (typeof value.acct != 'undefined') {
return '<img src="'+value.avatar+'" width="20"/>&nbsp;@'+value.acct;
} else if (typeof value.name != 'undefined') {
return '#'+value.name;
} else {
return shortnameTo(value, self.emojiTemplate) + " " + value.replace(/:/g, '');
}
},
replace: function (value) {
if (typeof value.acct == 'undefined') {
return shortnameTo(value, self.emojiTemplate);
}else{
if (typeof value.acct != 'undefined') {
return "@"+value.acct+ "&nbsp;";
}else if (typeof value.name != 'undefined') {
return "#"+value.name+ "&nbsp;";
}else{
return shortnameTo(value, self.emojiTemplate);
}
},
cache: true,

6
src/Controller/FediPlanController.php
View file

@ -247,6 +247,12 @@ class FediPlanController extends AbstractController
unset($compose);
unset($form);
$compose = new Compose();
$pollOption1 = new PollOption();
$pollOption1->setTitle("");
$compose->getPollOptions()->add($pollOption1);
$pollOption2 = new PollOption();
$pollOption2->setTitle("");
$compose->getPollOptions()->add($pollOption2);
$session->getFlashBag()->add(
'Success',
'The message has been scheduled'

2
templates/fediplan/index.html.twig
View file

@ -75,7 +75,7 @@
<blockquote class="blockquote text-center" style="margin-top: 50px;">
<p class="mb-0">{{ 'page.index.about'|trans |raw}}</p>
<p>{{ 'page.index.data'|trans |raw}}</p>
<footer class="blockquote-footer">FediPlan 1.0.0</footer>
<footer class="blockquote-footer">FediPlan 1.1.0</footer>
</blockquote>
{{ form_end(form) }}