aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Remove /tiny command

Browse Source 
boothj5 gave his okay too.

Fix https://github.com/profanity-im/profanity/issues/1370
This commit is contained in:
Michael Vetter 2020-07-10 17:48:34 +02:00
parent b6361ddeab
commit 39315483a8
6 changed files with 0 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -46,7 +46,6 @@ core_sources = \
src/tools/bookmark_ignore.c \
src/tools/bookmark_ignore.h \
src/tools/autocomplete.c src/tools/autocomplete.h \
src/tools/tinyurl.c src/tools/tinyurl.h \
src/tools/clipboard.c src/tools/clipboard.h \
src/config/files.c src/config/files.h \
src/config/conflists.c src/config/conflists.h \
@ -87,7 +86,6 @@ unittest_sources = \
src/tools/parser.c \
src/tools/parser.h \
src/tools/autocomplete.c src/tools/autocomplete.h \
src/tools/tinyurl.c src/tools/tinyurl.h \
src/tools/clipboard.c src/tools/clipboard.h \
src/tools/bookmark_ignore.c \
src/tools/bookmark_ignore.h \

17
src/command/cmd_defs.c
View File

@ -64,7 +64,6 @@
#include "plugins/plugins.h"
#include "tools/autocomplete.h"
#include "tools/parser.h"
#include "tools/tinyurl.h"
#include "ui/ui.h"
#include "ui/window_list.h"
#include "xmpp/xmpp.h"
@ -979,22 +978,6 @@ static struct cmd_t command_defs[] = {
"/sub request",
"/sub sent") },
{ "/tiny",
parse_args, 1, 1, NULL,
CMD_NOSUBFUNCS
CMD_MAINFUNC(cmd_tiny)
CMD_TAGS(
CMD_TAG_CHAT,
CMD_TAG_GROUPCHAT)
CMD_SYN(
"/tiny <url>")
CMD_DESC(
"Send url as tinyurl in current chat.")
CMD_ARGS(
{ "<url>", "The url to make tiny." })
CMD_EXAMPLES(
"Example: /tiny https://profanity-im.github.io/") },
{ "/who",
parse_args, 0, 2, NULL,
CMD_NOSUBFUNCS

53
src/command/cmd_funcs.c
View File

@ -69,7 +69,6 @@
#include "tools/http_upload.h"
#include "tools/autocomplete.h"
#include "tools/parser.h"
#include "tools/tinyurl.h"
#include "tools/bookmark_ignore.h"
#include "plugins/plugins.h"
#include "ui/ui.h"
@ -5032,58 +5031,6 @@ cmd_alias(ProfWin* window, const char* const command, gchar** args)
}
}
gboolean
cmd_tiny(ProfWin* window, const char* const command, gchar** args)
{
char* url = args[0];
if (window->type != WIN_CHAT && window->type != WIN_MUC && window->type != WIN_PRIVATE) {
cons_show("/tiny can only be used in chat windows");
return TRUE;
}
if (!tinyurl_valid(url)) {
win_println(window, THEME_ERROR, "-", "/tiny, badly formed URL: %s", url);
return TRUE;
}
char* tiny = tinyurl_get(url);
if (!tiny) {
win_println(window, THEME_ERROR, "-", "Couldn't create tinyurl.");
return TRUE;
}
switch (window->type) {
case WIN_CHAT:
{
ProfChatWin* chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
cl_ev_send_msg(chatwin, tiny, NULL);
break;
}
case WIN_PRIVATE:
{
ProfPrivateWin* privatewin = (ProfPrivateWin*)window;
assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK);
cl_ev_send_priv_msg(privatewin, tiny, NULL);
break;
}
case WIN_MUC:
{
ProfMucWin* mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
cl_ev_send_muc_msg(mucwin, tiny, NULL);
break;
}
default:
break;
}
free(tiny);
return TRUE;
}
gboolean
cmd_clear(ProfWin* window, const char* const command, gchar** args)
{

1
src/command/cmd_funcs.h
View File

@ -128,7 +128,6 @@ gboolean cmd_status_get(ProfWin* window, const char* const command, gchar** args
gboolean cmd_status_set(ProfWin* window, const char* const command, gchar** args);
gboolean cmd_sub(ProfWin* window, const char* const command, gchar** args);
gboolean cmd_theme(ProfWin* window, const char* const command, gchar** args);
gboolean cmd_tiny(ProfWin* window, const char* const command, gchar** args);
gboolean cmd_wintitle(ProfWin* window, const char* const command, gchar** args);
gboolean cmd_vercheck(ProfWin* window, const char* const command, gchar** args);
gboolean cmd_who(ProfWin* window, const char* const command, gchar** args);

100
src/tools/tinyurl.c
View File

@ -1,100 +0,0 @@
/*
* tinyurl.c
* vim: expandtab:ts=4:sts=4:sw=4
*
* Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
*
* This file is part of Profanity.
*
* Profanity is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Profanity 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Profanity. If not, see <https://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders give permission to
* link the code of portions of this program with the OpenSSL library under
* certain conditions as described in each individual source file, and
* distribute linked combinations including the two.
*
* You must obey the GNU General Public License in all respects for all of the
* code used other than OpenSSL. If you modify file(s) with this exception, you
* may extend this exception to your version of the file(s), but you are not
* obligated to do so. If you do not wish to do so, delete this exception
* statement from your version. If you delete this exception statement from all
* source files in the program, then also delete it here.
*
*/
#include <stdlib.h>
#include <string.h>
#include <sys/select.h>
#include <curl/curl.h>
#include <curl/easy.h>
#include <glib.h>
struct curl_data_t
{
char* buffer;
size_t size;
};
static size_t _data_callback(void* ptr, size_t size, size_t nmemb, void* data);
gboolean
tinyurl_valid(char* url)
{
return (g_str_has_prefix(url, "http://") || g_str_has_prefix(url, "https://"));
}
char*
tinyurl_get(char* url)
{
GString* full_url = g_string_new("http://tinyurl.com/api-create.php?url=");
g_string_append(full_url, url);
CURL* handle = curl_easy_init();
struct curl_data_t output;
output.buffer = NULL;
output.size = 0;
curl_easy_setopt(handle, CURLOPT_URL, full_url->str);
curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, _data_callback);
curl_easy_setopt(handle, CURLOPT_WRITEDATA, (void*)&output);
curl_easy_perform(handle);
curl_easy_cleanup(handle);
g_string_free(full_url, TRUE);
if (output.buffer) {
output.buffer[output.size++] = '\0';
return output.buffer;
} else {
return NULL;
}
}
static size_t
_data_callback(void* ptr, size_t size, size_t nmemb, void* data)
{
size_t realsize = size * nmemb;
struct curl_data_t* mem = (struct curl_data_t*)data;
mem->buffer = realloc(mem->buffer, mem->size + realsize + 1);
if (mem->buffer) {
memcpy(&(mem->buffer[mem->size]), ptr, realsize);
mem->size += realsize;
mem->buffer[mem->size] = 0;
}
return realsize;
}

44
src/tools/tinyurl.h
View File

@ -1,44 +0,0 @@
/*
* tinyurl.h
* vim: expandtab:ts=4:sts=4:sw=4
*
* Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
*
* This file is part of Profanity.
*
* Profanity is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Profanity 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Profanity. If not, see <https://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders give permission to
* link the code of portions of this program with the OpenSSL library under
* certain conditions as described in each individual source file, and
* distribute linked combinations including the two.
*
* You must obey the GNU General Public License in all respects for all of the
* code used other than OpenSSL. If you modify file(s) with this exception, you
* may extend this exception to your version of the file(s), but you are not
* obligated to do so. If you do not wish to do so, delete this exception
* statement from your version. If you delete this exception statement from all
* source files in the program, then also delete it here.
*
*/
#ifndef TOOLS_TINYURL_H
#define TOOLS_TINYURL_H
#include <glib.h>
gboolean tinyurl_valid(char* url);
char* tinyurl_get(char* url);
#endif