allow any (current) emoji to be displayed on any site, and provide a default list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices.

This commit is contained in:
redmatrix 2016-06-03 18:13:21 -07:00
parent e81ac9e063
commit a7e5e3d574
1775 changed files with 15 additions and 15 deletions

View File

@ -14,6 +14,8 @@ class ThreadItem {
private $template = 'conv_item.tpl'; private $template = 'conv_item.tpl';
private $comment_box_template = 'comment_item.tpl'; private $comment_box_template = 'comment_item.tpl';
private $commentable = false; private $commentable = false;
// list of supported reaction emojis - a site can over-ride this via config system.reactions
private $reactions = ['1f60a','1f44f','1f37e','1f48b','1f61e','2665','1f622','1f62e','1f634','1f61c','1f607','1f608'];
private $toplevel = false; private $toplevel = false;
private $children = array(); private $children = array();
private $parent = null; private $parent = null;
@ -50,6 +52,14 @@ class ThreadItem {
$this->add_child($child); $this->add_child($child);
} }
} }
// allow a site to configure the order and content of the reaction emoji list
if($this->toplevel) {
$x = get_config('system','reactions');
if($x && is_array($x) && count($x)) {
$this->reactions = $x;
}
}
} }
/** /**
@ -345,7 +355,7 @@ class ThreadItem {
'photo' => $body['photo'], 'photo' => $body['photo'],
'event' => $body['event'], 'event' => $body['event'],
'has_tags' => $has_tags, 'has_tags' => $has_tags,
'reactions' => $this->reactions,
// Item toolbar buttons // Item toolbar buttons
'emojis' => (($this->is_toplevel() && $this->is_commentable() && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''), 'emojis' => (($this->is_toplevel() && $this->is_commentable() && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''),
'like' => $like, 'like' => $like,

BIN
images/emoji/0023-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

BIN
images/emoji/0023.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 634 B

BIN
images/emoji/002a-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

BIN
images/emoji/002a.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 645 B

BIN
images/emoji/0030-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

BIN
images/emoji/0030.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

BIN
images/emoji/0031-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 B

BIN
images/emoji/0031.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

BIN
images/emoji/0032-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 567 B

BIN
images/emoji/0032.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

BIN
images/emoji/0033-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 B

BIN
images/emoji/0033.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

BIN
images/emoji/0034-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

BIN
images/emoji/0034.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 542 B

BIN
images/emoji/0035-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

BIN
images/emoji/0035.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

BIN
images/emoji/0036-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 612 B

BIN
images/emoji/0036.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 649 B

BIN
images/emoji/0037-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 B

BIN
images/emoji/0037.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 559 B

BIN
images/emoji/0038-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

BIN
images/emoji/0038.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

BIN
images/emoji/0039-20e3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 B

BIN
images/emoji/0039.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 654 B

BIN
images/emoji/00a9.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 B

BIN
images/emoji/00ae.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

BIN
images/emoji/1f004.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 951 B

BIN
images/emoji/1f0cf.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
images/emoji/1f170.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

BIN
images/emoji/1f171.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

BIN
images/emoji/1f17e.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

BIN
images/emoji/1f17f.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 B

BIN
images/emoji/1f18e.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

BIN
images/emoji/1f191.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

BIN
images/emoji/1f192.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

BIN
images/emoji/1f193.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

BIN
images/emoji/1f194.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

BIN
images/emoji/1f195.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 486 B

BIN
images/emoji/1f196.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

BIN
images/emoji/1f197.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 B

BIN
images/emoji/1f198.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

BIN
images/emoji/1f199.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

BIN
images/emoji/1f19a.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 942 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 997 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 975 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 430 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 962 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 848 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 789 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 490 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 444 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 513 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 795 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 554 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 495 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
images/emoji/1f1e7.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 572 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 755 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 851 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 748 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 524 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 419 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 665 B

Some files were not shown because too many files have changed in this diff Show More